Pass -j1 on Travis

Looks like if we do things concurrently we hit the OOM killer, so let's not do
that!

diff --git a/.travis.yml b/.travis.yml
index 85f59b93022b4207d9b03e300240493c0146b323..2aef32ba66c58a386c2cde18105def134fdd34e5 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,10 @@ after_success: |
   git push -qf https://${TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
 env:
   global:
+    # apparently we use too much memory and if there's more than one rustc then
+    # when compiling Cargo's unit tests some compilers will be randomly kill
+    # -9'd
+    - CARGOFLAGS=-j1
     - secure: scGpeetUfba5RWyuS4yt10bPoFAI9wpHEReIFqEx7eH5vr2Anajk6+70jW6GdrWVdUvdINiArlQ3An2DeB9vEUWcBjw8WvuPtOH0tDMoSsuVloPlFD8yn1Ac0Bx9getAO5ofxqtoNg+OV4MDVuGabEesqAOWqURNrBC7XK+ntC8=
 
 os:

diff --git a/Makefile.in b/Makefile.in
index 2d5a6e23f42a0efe335e2870436a71367433d043..aefb9cade73f45063ee14070859f40f616a6dc83 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,11 +95,11 @@ cargo-$(1): $$(CARGO) target/openssl/$(1).stamp
        $$(CARGO) --version
        $$(CARGO) build --target $(1) \
                --manifest-path $(S)Cargo.toml \
-               $$(OPT_FLAG) $$(VERBOSE_FLAG) $$(ARGS)
+               $$(OPT_FLAG) $$(CARGOFLAGS) $$(VERBOSE_FLAG) $$(ARGS)
 
 test-unit-$(1): $$(CARGO)
        @mkdir -p target/$(1)/cit
-       $$(CARGO) test --target $(1) $$(VERBOSE_FLAG) $$(only)
+       $$(CARGO) test --target $(1) $$(CARGOFLAGS) $$(VERBOSE_FLAG) $$(only)
 endef
 $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))